Backport 0.3: Update nixpkgs 24.11 #112
Merged
+25
−72
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cdunster
approved these changes
Jan 3, 2025
| @@ -101,7 +105,7 @@ | |||
| buildInputs = [ | |||
| pkgs.go | |||
| pkgs.perl | |||
| ]; | |||
| ] ++ (pkgs.lib.optionals pkgs.stdenv.isDarwin apple_sdk); | |||
There was a problem hiding this comment.
nitpick: Do we need to check isDarwin and the system? Also, if it's just one package then we can use the lib.optional function instead.
Suggested change
| ] ++ (pkgs.lib.optionals pkgs.stdenv.isDarwin apple_sdk); | |
| ] | |
| # On intel macs, the default SDK is still 10.12 and Holochain won't build against that because we're | |
| # using a newer Go version. So override with the newest SDK available for x86_64-darwin. | |
| ++ (pkgs.lib.optional (if system == "x86_64-darwin") pkgs.apple-sdk_10_15); |
This really is just a style thing though so I leave the decision up to you 🙂
There was a problem hiding this comment.
👍 It's a little more precise, though it makes no difference to the aarch64 systems.
There was a problem hiding this comment.
We don't really no, but since this change is being backported, I'd rather not just fix this on 0.3. I'll put a PR to tidy this up on main and leave main-0.3 and main-0.4 as they are
Comment on lines
+90
to
+93
|
|
||
| # On intel macs, the default SDK is still 10.12 and Holochain won't build against that because we're | ||
| # using a newer Go version. So override with the newest SDK available for x86_64-darwin. | ||
| apple_sdk = if system == "x86_64-darwin" then [ pkgs.apple-sdk_10_15 ] else [ ]; |
There was a problem hiding this comment.
See the comment below.
Suggested change
| # On intel macs, the default SDK is still 10.12 and Holochain won't build against that because we're | |
| # using a newer Go version. So override with the newest SDK available for x86_64-darwin. | |
| apple_sdk = if system == "x86_64-darwin" then [ pkgs.apple-sdk_10_15 ] else [ ]; |
jost-s
approved these changes
Jan 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.